Fix keepalive and shared key bug #2456
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
If keepalive, #connect always returns integer returned by L1104 Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
ganmacs
force-pushed
the
fix-keepalive-and-shared-key-bug
branch
from
8cabcf2
to
6703121
Compare
if the socket which already handshaked tries to handshake, it will be blocked and raise IO::WaitReadable [here](https://github.com/fluent/fluentd/blob/12ffa0afe313737bf09900efce8c8656baaf77bc/lib/fluent/plugin/out_forward.rb#L787 ). Signed-off-by: Yuta Iwama <ganmacs@gmail.com>
ganmacs
force-pushed
the
fix-keepalive-and-shared-key-bug
branch
from
6703121
to
12f3380
Compare
|
Thanks. I confirmed this works. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Which issue(s) this PR fixes:
Fixes #2451
What this PR does / why we need it:
If the socket which already handshaked tries to handshake, it will be
blocked and raise IO::WaitReadable here.
So, I changed the code to avoid invoking handshake twice on the same socket.
Docs Changes:
no
Release Note:
no